From: Jan Beulich Date: Thu, 8 Dec 2016 11:20:59 +0000 (+0100) Subject: x86emul: drop dead code from SYSENTER handling X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3225 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8a12e23c692d5607a877cba11033e1f8aba4d402;p=xen.git x86emul: drop dead code from SYSENTER handling There's no point reading CS - all of the fields get set from scratch right afterwards. Also correct a wrong comment. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index dfa3c6cac1..7092c4f25d 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4863,12 +4863,10 @@ x86_emulate( _regs.eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF); - fail_if(ops->read_segment == NULL); - ops->read_segment(x86_seg_cs, &cs, ctxt); cs.sel = msr_content & ~3; /* SELECTOR_RPL_MASK */ cs.base = 0; /* flat segment */ cs.limit = ~0u; /* 4GB limit */ - cs.attr.bytes = lm ? 0xa9b /* L+DB+P+S+Code */ + cs.attr.bytes = lm ? 0xa9b /* G+L+P+S+Code */ : 0xc9b; /* G+DB+P+S+Code */ sreg.sel = cs.sel + 8;